Skip to content

Ender Locus#62

Merged
FourIsTheNumber merged 37 commits into
masterfrom
QED
Jun 27, 2026
Merged

Ender Locus#62
FourIsTheNumber merged 37 commits into
masterfrom
QED

Conversation

@FourIsTheNumber

@FourIsTheNumber FourIsTheNumber commented Nov 13, 2025

Copy link
Copy Markdown
Collaborator

Equivalent to the QED

# Conflicts:
#	src/main/java/com/fouristhenumber/utilitiesinexcess/ModBlocks.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/config/blocks/BlockConfig.java
#	src/main/resources/assets/utilitiesinexcess/lang/en_US.lang
@github-actions

Copy link
Copy Markdown
Contributor

#67

github-actions Bot and others added 4 commits November 20, 2025 21:46
Co-authored-by: GitHub GTNH Actions <>
# Conflicts:
#	src/main/java/com/fouristhenumber/utilitiesinexcess/ModBlocks.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/config/blocks/BlockConfig.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/utils/UIEUtils.java
Comment thread src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockQED.java Outdated
@FourIsTheNumber FourIsTheNumber marked this pull request as draft January 2, 2026 00:31
@FourIsTheNumber FourIsTheNumber marked this pull request as ready for review June 24, 2026 06:26
@github-actions

Copy link
Copy Markdown
Contributor

#172

@github-actions

Copy link
Copy Markdown
Contributor

#174

github-actions Bot and others added 3 commits June 24, 2026 18:03
@FourIsTheNumber FourIsTheNumber changed the title QED base Ender Locus Jun 27, 2026
@FourIsTheNumber

Copy link
Copy Markdown
Collaborator Author

I'm highkey merging this

@FourIsTheNumber FourIsTheNumber merged commit e932e08 into master Jun 27, 2026
1 check passed
@FourIsTheNumber FourIsTheNumber deleted the QED branch June 27, 2026 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants